Add a sanity g_return_if_fail() check for the depths for the window and

Tue May 14 15:40:49 2002  Owen Taylor  <otaylor@redhat.com>

        * gdk/x11/gdkwindow-{linux-fb,win32,x11.c} (gdk_window_set_back_pixmap):        Add a sanity g_return_if_fail() check for the depths
        for the window and pixmap. (#79191, Shivaram Upadhyayula)

diff --git a/ChangeLog b/ChangeLog
index 14fdb81fefe1bf51e6142d11c87fe6f053c70f93..01f15e5616092e191dce751a0b33abbc9831cefa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue May 14 15:40:49 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkwindow-{linux-fb,win32,x11.c} (gdk_window_set_back_pixmap):
+       Add a sanity g_return_if_fail() check for the depths
+       for the window and pixmap. (#79191, Shivaram Upadhyayula)
+
 Tue May 14 15:09:33 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkkeys-x11.c: Try adding a #ifndef/#define

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 14fdb81fefe1bf51e6142d11c87fe6f053c70f93..01f15e5616092e191dce751a0b33abbc9831cefa 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Tue May 14 15:40:49 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkwindow-{linux-fb,win32,x11.c} (gdk_window_set_back_pixmap):
+       Add a sanity g_return_if_fail() check for the depths
+       for the window and pixmap. (#79191, Shivaram Upadhyayula)
+
 Tue May 14 15:09:33 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkkeys-x11.c: Try adding a #ifndef/#define

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 14fdb81fefe1bf51e6142d11c87fe6f053c70f93..01f15e5616092e191dce751a0b33abbc9831cefa 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Tue May 14 15:40:49 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkwindow-{linux-fb,win32,x11.c} (gdk_window_set_back_pixmap):
+       Add a sanity g_return_if_fail() check for the depths
+       for the window and pixmap. (#79191, Shivaram Upadhyayula)
+
 Tue May 14 15:09:33 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkkeys-x11.c: Try adding a #ifndef/#define

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 14fdb81fefe1bf51e6142d11c87fe6f053c70f93..01f15e5616092e191dce751a0b33abbc9831cefa 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Tue May 14 15:40:49 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkwindow-{linux-fb,win32,x11.c} (gdk_window_set_back_pixmap):
+       Add a sanity g_return_if_fail() check for the depths
+       for the window and pixmap. (#79191, Shivaram Upadhyayula)
+
 Tue May 14 15:09:33 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkkeys-x11.c: Try adding a #ifndef/#define

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 14fdb81fefe1bf51e6142d11c87fe6f053c70f93..01f15e5616092e191dce751a0b33abbc9831cefa 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Tue May 14 15:40:49 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkwindow-{linux-fb,win32,x11.c} (gdk_window_set_back_pixmap):
+       Add a sanity g_return_if_fail() check for the depths
+       for the window and pixmap. (#79191, Shivaram Upadhyayula)
+
 Tue May 14 15:09:33 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkkeys-x11.c: Try adding a #ifndef/#define

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 14fdb81fefe1bf51e6142d11c87fe6f053c70f93..01f15e5616092e191dce751a0b33abbc9831cefa 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Tue May 14 15:40:49 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkwindow-{linux-fb,win32,x11.c} (gdk_window_set_back_pixmap):
+       Add a sanity g_return_if_fail() check for the depths
+       for the window and pixmap. (#79191, Shivaram Upadhyayula)
+
 Tue May 14 15:09:33 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkkeys-x11.c: Try adding a #ifndef/#define

diff --git a/gdk/linux-fb/gdkwindow-fb.c b/gdk/linux-fb/gdkwindow-fb.c
index 44a674cf6eed15c0697836f0d6429a86ead75849..30090fd53af140c6591dfa470f43d5d0e416fe85 100644 (file)
--- a/gdk/linux-fb/gdkwindow-fb.c
+++ b/gdk/linux-fb/gdkwindow-fb.c
@@ -1469,6 +1469,7 @@ gdk_window_set_back_pixmap (GdkWindow *window,
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
   g_return_if_fail (pixmap == NULL || !parent_relative);
+  g_return_if_fail (pixmap == NULL || gdk_drawable_get_depth (window) == gdk_drawable_get_depth (pixmap));
 
   old_pixmap = private->bg_pixmap;
 

diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index da6b50d835542b6abcdc77c41176e5094e1f46b8..f46dd666f57a33e7aba18317a020e3dda5862446 100644 (file)
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -1563,6 +1563,7 @@ gdk_window_set_back_pixmap (GdkWindow *window,
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
   g_return_if_fail (pixmap == NULL || !parent_relative);
+  g_return_if_fail (pixmap == NULL || gdk_drawable_get_depth (window) == gdk_drawable_get_depth (pixmap));
   
   if (private->bg_pixmap &&
       private->bg_pixmap != GDK_PARENT_RELATIVE_BG &&

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 903afe68ab9e2521ccab70b75a9c423a6782c617..91ec8fe0840c8e85b0b2104999fc9634dfaca332 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -2129,7 +2129,8 @@ gdk_window_set_back_pixmap (GdkWindow *window,
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
   g_return_if_fail (pixmap == NULL || !parent_relative);
-
+  g_return_if_fail (pixmap == NULL || gdk_drawable_get_depth (window) == gdk_drawable_get_depth (pixmap));
+  
   if (private->bg_pixmap &&
       private->bg_pixmap != GDK_PARENT_RELATIVE_BG &&
       private->bg_pixmap != GDK_NO_BG)